eclipse format and cleanup