Revert "Ok"

This reverts commit 78cae10ed336dac1d506d1f9e107fd8f56deefd9.
Revert "NetBeans format"

This reverts commit c11b357337851292785014079118f49fa47696aa.
Changes (Can't remember everything so this is a non-descriptive commit)
Added things