Cleaner management code and no periods for now