cleaned up layout of js