Cleaned up L&F for code