Removed comments and fixed time instantiation