Improved comments and cleaned up imports