Cleaned the code a bit. Prepared for future updates that will come soon