Cleaned up the startup script further