Made changes based on Netbeans format limitations