Cleaned up Cogito code a little bit