Removed unnecessary codes. Keep it simple for now. A minor issue is fixed.