Cleaned up startup process