Cleaned up Startup script