Better organisation of globals?