Added comments and moved few things. Also, butter