Clean up syntax a little bit and remove try except flow control