Small fixes and increased readability