Cleaned code in main class, began work on signal indicator